Fix expected pad size for decrypt operations#147
Merged
rlm2002 merged 1 commit intowolfSSL:masterfrom Aug 26, 2025
Merged
Conversation
cconlon
force-pushed
the
cipherDecryptPadSize
branch
from
a167dea to
3307403
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a bug in the WolfCryptCipher implementation where getOutputSize() was incorrectly adding padding bytes during decrypt operations. The fix ensures that when decrypting, the output size calculation doesn't include padding since it gets stripped during decryption.
- Modified
getOutputSize()method to only add padding size during encrypt operations - Added comprehensive JUnit test for both AES-ECB encrypt and decrypt modes to prevent regression
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/main/java/com/wolfssl/provider/jce/WolfCryptCipher.java | Fixed getOutputSize() to conditionally add padding only for encrypt operations in both AES and DES3 cipher implementations |
| src/test/java/com/wolfssl/provider/jce/test/WolfCryptCipherTest.java | Added regression test verifying correct output size calculation for both encrypt and decrypt modes |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
rlm2002
approved these changes
Aug 26, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes the expected output size for Cipher decrypt operations. When doing decrypt, the output size should not be increased with expected padding, since that padding will be stripped off during decryption.
JUnit test added for regression prevention.
This fixes OpenJDK SunJCE test:
crypto/provider/Cipher/AES/Test4513830.java